Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow database relinking attempt during import #428

Merged
merged 10 commits into from
Jul 22, 2020
Merged

Allow database relinking attempt during import #428

merged 10 commits into from
Jul 22, 2020

Conversation

dgdekoning
Copy link
Contributor

Due to no standard naming scheme for , it is possible for the local BW2Package import to 'fail' because the dependent databases 'do not exist'.

This pull-request allows users to select, for each database that doesn't exist, an alternative. An attempt is then made to relink all of the relevant exchanges in the import using this other database name instead.

If this still results in an error (the new key doesn't exist), then database import will fail as usual.

dgdekoning and others added 4 commits July 8, 2020 10:08
* Fixes product name for newly created activities

* Ensure db metadata is updated when change occurs
This will update metadata to ensure 'depends' is correct
@dgdekoning dgdekoning added the feature Issues/PRs related to a new feature label Jul 8, 2020
@dgdekoning dgdekoning added this to the Version 2.6.0 milestone Jul 8, 2020
@dgdekoning dgdekoning added the bug Issues/PRs related to bugs label Jul 8, 2020
@dgdekoning
Copy link
Contributor Author

This also contains a few bug-fixes for annoyances.

@coveralls
Copy link

coveralls commented Jul 8, 2020

Coverage Status

Coverage decreased (-0.4%) to 53.666% when pulling 4a459c4 on dgdekoning:relink-db into b0f3a18 on LCA-ActivityBrowser:master.

@dgdekoning
Copy link
Contributor Author

dgdekoning commented Jul 11, 2020

This is turning out to be really annoying. The database import takes place within a thread, so handling exceptions is exceedingly difficult without halting the thread and restarting it later.

A possible solution would be to start a hidden 'fixit' thread and make use of the QWaitCondition if any errors take place.

(edit) Though having said it, maybe halting the thread, asking for input and restarting it would be a good fix...

@dgdekoning dgdekoning requested a review from bsteubing July 13, 2020 11:51
@dgdekoning dgdekoning merged commit 1f8bb2c into LCA-ActivityBrowser:master Jul 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Issues/PRs related to bugs feature Issues/PRs related to a new feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants